Index class-likes declared inside conditional blocks#154
Merged
AJenbo merged 3 commits intoJun 20, 2026
Conversation
A named class/interface/trait/enum declared inside an if/else (or try/ switch/loop) block — e.g. Doctrine's ServiceEntityRepository, defined per ORM version inside an 'if (! property_exists(...))' guard — was discovered by name only: its parent and @extends/@template-extends generics were dropped, so the inheritance/generic chain collapsed ($repo->find() resolved to object/mixed instead of the entity). Descend into container-statement bodies when extracting class-likes (parser/classes.rs), route top-level containers through the extractor (parser/mod.rs, parser/ast_update.rs), and keep the first declaration when the same FQN appears in multiple branches (first-occurrence-wins, matching PHPStan/Psalm and the existing classmap convention). Adds unit tests + an assert_type regression fixture.
|
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
…#154) Signed-off-by: Anders Jenbo <anders@jenbo.dk>
AJenbo
previously approved these changes
Jun 20, 2026
Collaborator
|
Thanks |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes: #153
A named class/interface/trait/enum declared inside an if/else (or try/ switch/loop) block — e.g. Doctrine's ServiceEntityRepository, defined per ORM version inside an 'if (! property_exists(...))' guard — was discovered by name only: its parent and @extends/@template-extends generics were dropped, so the inheritance/generic chain collapsed ($repo->find() resolved to object/mixed instead of the entity).
Descend into container-statement bodies when extracting class-likes (parser/classes.rs), route top-level containers through the extractor (parser/mod.rs, parser/ast_update.rs), and keep the first declaration when the same FQN appears in multiple branches (first-occurrence-wins, matching PHPStan/Psalm and the existing classmap convention).
Adds unit tests + an assert_type regression fixture.